From 5c62a90e38590eb739c2f8c176af6cd8284518b9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 12 Jan 2006 04:33:33 +0000 Subject: [PATCH] Fix a C99ism --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ gtk/gtklabel.c | 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 30114695a4..d146b82306 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-01-11 Matthias Clasen + + * gtk/gtklabel.c: Fix a C99ism (#326658, Kazuki Iwamoto) + 2006-01-11 Matthias Clasen * gtk/gtklabel.c: Add some notify batching, always diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 30114695a4..d146b82306 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2006-01-11 Matthias Clasen + + * gtk/gtklabel.c: Fix a C99ism (#326658, Kazuki Iwamoto) + 2006-01-11 Matthias Clasen * gtk/gtklabel.c: Add some notify batching, always diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index e0557422ff..28cc24e810 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -1794,11 +1794,12 @@ get_label_wrap_width (GtkLabel *label) PangoLayout *layout; GtkStyle *style = GTK_WIDGET (label)->style; static GQuark quark_label_wrap_width = 0; + LabelWrapWidth *wrap_width; if (quark_label_wrap_width == 0) quark_label_wrap_width = g_quark_from_static_string ("gtk-label-wrap-width"); - LabelWrapWidth *wrap_width = g_object_get_qdata (G_OBJECT (style), quark_label_wrap_width); + wrap_width = g_object_get_qdata (G_OBJECT (style), quark_label_wrap_width); if (!wrap_width) { wrap_width = g_slice_new0 (LabelWrapWidth); -- 2.30.2